From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 27 Jul 2018 11:23:58 +0000 (+0200)
Subject: luci-base: xhr.js: decode JSON for POST requests as well
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=98217f8f8dd1835824405d5bf3ceb95dd8f40032;p=project%2Fluci.git

luci-base: xhr.js: decode JSON for POST requests as well

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/xhr.js b/modules/luci-base/htdocs/luci-static/resources/xhr.js
index 62b525ebb0..25a90e7254 100644
--- a/modules/luci-base/htdocs/luci-static/resources/xhr.js
+++ b/modules/luci-base/htdocs/luci-static/resources/xhr.js
@@ -65,12 +65,8 @@ XHR = function()
 			if (xhr.readyState == 4) {
 				var json = null;
 				if (xhr.getResponseHeader("Content-Type") == "application/json") {
-					try {
-						json = JSON.parse(xhr.responseText);
-					}
-					catch(e) {
-						json = null;
-					}
+					try { json = JSON.parse(xhr.responseText); }
+					catch(e) { json = null; }
 				}
 
 				callback(xhr, json, Date.now() - ts);
@@ -90,8 +86,15 @@ XHR = function()
 
 		xhr.onreadystatechange = function()
 		{
-			if (xhr.readyState == 4)
-				callback(xhr, null, Date.now() - ts);
+			if (xhr.readyState == 4) {
+				var json = null;
+				if (xhr.getResponseHeader("Content-Type") == "application/json") {
+					try { json = JSON.parse(xhr.responseText); }
+					catch(e) { json = null; }
+				}
+
+				callback(xhr, json, Date.now() - ts);
+			}
 		}
 
 		xhr.open('POST', url, true);